bitkeeper revision 1.843 (40714f09cklfEzBYIm_KulGL0G3wqw)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 5 Apr 2004 12:20:25 +0000 (12:20 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Mon, 5 Apr 2004 12:20:25 +0000 (12:20 +0000)
commitc90034fe4c87797071a9f59c7d171615dd1bb414
tree331f2719522cfd895e3ba8c1741e42135ed3e7d5
parent6f5fbf3e4c6514dd5dbd8fae39f1c6cde3fdefe4
parent8861f72c5bbee31fe0ae33d3eb8e9fd6e2b3f796
bitkeeper revision 1.843 (40714f09cklfEzBYIm_KulGL0G3wqw)

Manual merge
xen/common/memory.c
xen/include/xen/shadow.h